Update copyright and rules

diff --git a/debian/changelog b/debian/changelog
index 961696a6069f7dd278322394037355b13ca9eb40..cbb51cce9aeb826538d4d9a1aa12559ef5bfb380 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dcmtk (3.6.2-1~exp1) experimental; urgency=medium
   * d/p/* refresh patches
   * drop d/p/09_ because it was applied upstream   
   * s/* update SO version
+  * d/copyright: add new files to copyright
+  * d/rules: drop more test programs and add manpage for msgserv
 
  -- Gert Wollny <gewo@debian.org>  Wed, 02 Aug 2017 13:48:47 +0000
 

diff --git a/debian/copyright b/debian/copyright
index f1320267908d2196cc6ab39d9c777872fa546405..13e92787a53f76da97e16453a199d1d3cfcfbcaa 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -222,6 +222,20 @@ Files: oflog/include/dcmtk/oflog/log4judp.h
 Copyright: 2012 Siva Chandran P
 License: Apache-2.0 
 
+Files: config/stdcxx.m4
+Copyright: 2008 Benjamin Kosnik <bkoz@redhat.com>
+ 2012 Zack Weinberg <zackw@panix.com>
+ 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+ 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+ 2015 Paul Norman <penorman@mac.com>
+ 2015 Moritz Klammler <moritz@klammler.eu>
+ 2016 Krzesimir Nowak <qdlacz@gmail.com>
+License: stdcxx-m4
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved.  This file is offered as-is, without any
+ warranty.
+
 Files:  oflog/include/dcmtk/oflog/appender.h
         oflog/include/dcmtk/oflog/config/win32.h
         oflog/include/dcmtk/oflog/configrt.h
@@ -396,7 +410,7 @@ Files: dcmrt/include/dcmtk/dcmrt/drttypes.h
        dcmrt/libsrc/drtbvcps.cc
        dcmrt/libsrc/drtmas.cc
 Copyright: 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
-           2013-2016, J. Riesmeier, Oldenburg, Germany
+           2013-2017, J. Riesmeier, Oldenburg, Germany
 License: BSD-3-clause-Riesmeier
 
 Files: dcmrt/include/dcmtk/dcmrt/drmdose.h
@@ -434,10 +448,10 @@ Files: dcmfg/include/dcmtk/dcmfg/fgframeanatomy.h
  dcmiod/libsrc/iodreferences.cc
  dcmiod/libsrc/modfloatingpointimagepixel.cc
  dcmiod/libsrc/modimagepixelbase.cc
-Copyright: Copyright (C) 2016, Open Connections GmbH
+ dcmdata/tests/tnewdcme.cc
+Copyright: Copyright (C) 2017, Open Connections GmbH
 License: OFFISeV
 
-
 Files: CMake/android.toolchain.cmake
 Copyright: 2010-2011, Ethan Rublee
            2011-2014, Andrey Kamaev

diff --git a/debian/rules b/debian/rules
index 8b35bf22dee43a9b0560310d221e312373e1f088..7908539f3e5bb965fe0c0a54381f813e3d9315a2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,10 @@ override_dh_auto_build-arch:
        #$(MAKE) -C obj-* man
        dh_auto_build
 
+override_dh_installman:
+        help2man --version-string 3.6.2 --no-info debian/dcmtk/usr/bin/msgserv  > msgserv.1
+        dh_installman msgserv.1
+
 # Let's be smart with building doc
 override_dh_auto_build-indep:
        $(MAKE) -C obj-* DOXYGEN
@@ -74,10 +78,11 @@ override_dh_installdocs:
 
 override_dh_install-arch:
        dh_install # --list-missing
-       # wotsit ?
+       #remove test binaries 
        rm ./debian/dcmtk/usr/bin/*_tests
        rm ./debian/dcmtk/usr/bin/drttest
        rm ./debian/dcmtk/usr/bin/mkreport
+       rm ./debian/dcmtk/usr/bin/wltest
 
 get-orig-source:
        uscan --force-download --verbose --rename